Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[magnum-plugins] Fix file conflict with stb #12458

Merged
merged 1 commit into from
Jul 21, 2020
Merged

[magnum-plugins] Fix file conflict with stb #12458

merged 1 commit into from
Jul 21, 2020

Conversation

JackBoosY
Copy link
Contributor

@JackBoosY JackBoosY commented Jul 17, 2020 •
edited
Loading 

D:\buildtrees\magnum-plugins\src\v2020.06-f0c46dc4fa.clean\src\MagnumPlugins\StbImageImporter\StbImageImporter.cpp(91): error C3861: 'stbi_set_flip_vertically_on_load_thread': identifier not found
D:\buildtrees\magnum-plugins\src\v2020.06-f0c46dc4fa.clean\src\MagnumPlugins\StbImageImporter\StbImageImporter.cpp(95): error C3861: 'stbi_convert_iphone_png_to_rgb_thread': identifier not found

magnum-plugins uses internal stb_image.h, this file conflict and different with port stb, so change the include content.

Related #12103.

@JackBoosY JackBoosY added category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. labels Jul 17, 2020
@StarGate-One StarGate-One mentioned this pull request Jul 17, 2020
Closed
@JackBoosY JackBoosY marked this pull request as ready for review July 18, 2020 12:21
@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Jul 18, 2020
This was referenced Jul 20, 2020
Merged
Merged
@traversaro traversaro mentioned this pull request Jul 20, 2020
Merged
@strega-nil strega-nil merged commit c0d7b39 into microsoft:master Jul 21, 2020
@JackBoosY JackBoosY deleted the dev/jack/12103 branch July 21, 2020 02:50
hellozee pushed a commit to hellozee/vcpkg that referenced this pull request Sep 11, 2020
@JackBoosY @hellozee
[magnum-plugins] Fix file conflict with stb (microsoft#12458)
1a7ec7b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PhoebeHui PhoebeHui PhoebeHui approved these changes

Assignees

@PhoebeHui PhoebeHui

Labels
category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@JackBoosY @PhoebeHui @strega-nil